Fix some things in streaming and admin API for 3.3.0 support

1 files changed, 19 insertions, 19 deletions

diff --git a/tests/cassettes/test_status_post[Content warning-private].yaml b/tests/cassettes/test_status_post[Content warning-private].yaml
index f6c5e43..6905bac 100644
--- a/tests/cassettes/test_status_post[Content warning-private].yaml
+++ b/tests/cassettes/test_status_post[Content warning-private].yaml
@@ -20,18 +20,18 @@ interactions:
     uri: http://localhost:3000/api/v1/statuses
   response:
     body:
-      string: '{"id":"109336907896557916","created_at":"2022-11-13T14:13:34.341Z","in_reply_to_id":null,"in_reply_to_account_id":null,"sensitive":true,"spoiler_text":"Content
-        warning","visibility":"private","language":"ja","uri":"http://localhost:3000/users/mastodonpy_test/statuses/109336907896557916","url":"http://localhost:3000/@mastodonpy_test/109336907896557916","replies_count":0,"reblogs_count":0,"favourites_count":0,"edited_at":null,"favourited":false,"reblogged":false,"muted":false,"bookmarked":false,"pinned":false,"content":"\u003cp\u003eToot!\u003c/p\u003e","filtered":[],"reblog":null,"application":{"name":"Mastodon.py
-        test suite","website":null},"account":{"id":"109336899193569236","username":"mastodonpy_test","acct":"mastodonpy_test","display_name":"John
+      string: '{"id":"109337448591433112","created_at":"2022-11-13T16:31:04.690Z","in_reply_to_id":null,"in_reply_to_account_id":null,"sensitive":true,"spoiler_text":"Content
+        warning","visibility":"private","language":"ja","uri":"http://localhost:3000/users/mastodonpy_test/statuses/109337448591433112","url":"http://localhost:3000/@mastodonpy_test/109337448591433112","replies_count":0,"reblogs_count":0,"favourites_count":0,"edited_at":null,"favourited":false,"reblogged":false,"muted":false,"bookmarked":false,"pinned":false,"content":"\u003cp\u003eToot!\u003c/p\u003e","filtered":[],"reblog":null,"application":{"name":"Mastodon.py
+        test suite","website":null},"account":{"id":"109337440686176140","username":"mastodonpy_test","acct":"mastodonpy_test","display_name":"John
         Lennon","locked":true,"bot":false,"discoverable":null,"group":false,"created_at":"2022-11-13T00:00:00.000Z","note":"\u003cp\u003eI
-        walk funny\u003c/p\u003e","url":"http://localhost:3000/@mastodonpy_test","avatar":"http://localhost:3000/system/accounts/avatars/109/336/899/193/569/236/original/e639fe005819e5b9.jpg","avatar_static":"http://localhost:3000/system/accounts/avatars/109/336/899/193/569/236/original/e639fe005819e5b9.jpg","header":"http://localhost:3000/system/accounts/headers/109/336/899/193/569/236/original/26075346d9e9e361.jpg","header_static":"http://localhost:3000/system/accounts/headers/109/336/899/193/569/236/original/26075346d9e9e361.jpg","followers_count":0,"following_count":0,"statuses_count":9,"last_status_at":"2022-11-13","noindex":false,"emojis":[],"fields":[{"name":"bread","value":"toasty.","verified_at":null},{"name":"lasagna","value":"no!!!","verified_at":null}]},"media_attachments":[],"mentions":[],"tags":[],"emojis":[],"card":null,"poll":null}'
+        walk funny\u003c/p\u003e","url":"http://localhost:3000/@mastodonpy_test","avatar":"http://localhost:3000/system/accounts/avatars/109/337/440/686/176/140/original/d6cd9a5a5e65da30.jpg","avatar_static":"http://localhost:3000/system/accounts/avatars/109/337/440/686/176/140/original/d6cd9a5a5e65da30.jpg","header":"http://localhost:3000/system/accounts/headers/109/337/440/686/176/140/original/2b7760a42692fbde.jpg","header_static":"http://localhost:3000/system/accounts/headers/109/337/440/686/176/140/original/2b7760a42692fbde.jpg","followers_count":0,"following_count":0,"statuses_count":10,"last_status_at":"2022-11-13","noindex":false,"emojis":[],"fields":[{"name":"bread","value":"toasty.","verified_at":null},{"name":"lasagna","value":"no!!!","verified_at":null}]},"media_attachments":[],"mentions":[],"tags":[],"emojis":[],"card":null,"poll":null}'
     headers:
       Cache-Control:
       - no-store
       Content-Security-Policy:
       - 'base-uri ''none''; default-src ''none''; frame-ancestors ''none''; font-src
         ''self'' http://localhost:3000; img-src ''self'' https: data: blob: http://localhost:3000;
-        style-src ''self'' http://localhost:3000 ''nonce-8xi/Gj6diYTNo3oSXWaarQ=='';
+        style-src ''self'' http://localhost:3000 ''nonce-jnYW7q1nIGyWk+Vfdc2zDQ=='';
         media-src ''self'' https: data: http://localhost:3000; frame-src ''self''
         https:; manifest-src ''self'' http://localhost:3000; connect-src ''self''
         data: blob: http://localhost:3000 http://localhost:3000 ws://localhost:4000
@@ -41,7 +41,7 @@ interactions:
       Content-Type:
       - application/json; charset=utf-8
       ETag:
-      - W/"122101fc7341892710308f401f56a50f"
+      - W/"4aa5a145eb4d20035b114d1669500e76"
       Referrer-Policy:
       - strict-origin-when-cross-origin
       Transfer-Encoding:
@@ -59,13 +59,13 @@ interactions:
       X-RateLimit-Limit:
       - '300'
       X-RateLimit-Remaining:
-      - '207'
+      - '205'
       X-RateLimit-Reset:
-      - '2022-11-13T15:00:00.360446Z'
+      - '2022-11-13T18:00:00.709684Z'
       X-Request-Id:
-      - 05868784-d1b8-4966-8401-aec397e38332
+      - 339a4dd9-5005-4a3a-a13a-21d19226713b
       X-Runtime:
-      - '0.031319'
+      - '0.031977'
       X-XSS-Protection:
       - 1; mode=block
     status:
@@ -87,21 +87,21 @@ interactions:
       User-Agent:
       - tests/v311
     method: DELETE
-    uri: http://localhost:3000/api/v1/statuses/109336907896557916
+    uri: http://localhost:3000/api/v1/statuses/109337448591433112
   response:
     body:
-      string: '{"id":"109336907896557916","created_at":"2022-11-13T14:13:34.341Z","in_reply_to_id":null,"in_reply_to_account_id":null,"sensitive":true,"spoiler_text":"Content
-        warning","visibility":"private","language":"ja","uri":"http://localhost:3000/users/mastodonpy_test/statuses/109336907896557916","url":"http://localhost:3000/@mastodonpy_test/109336907896557916","replies_count":0,"reblogs_count":0,"favourites_count":0,"edited_at":null,"favourited":false,"reblogged":false,"muted":false,"bookmarked":false,"pinned":false,"text":"Toot!","filtered":[],"reblog":null,"application":{"name":"Mastodon.py
-        test suite","website":null},"account":{"id":"109336899193569236","username":"mastodonpy_test","acct":"mastodonpy_test","display_name":"John
+      string: '{"id":"109337448591433112","created_at":"2022-11-13T16:31:04.690Z","in_reply_to_id":null,"in_reply_to_account_id":null,"sensitive":true,"spoiler_text":"Content
+        warning","visibility":"private","language":"ja","uri":"http://localhost:3000/users/mastodonpy_test/statuses/109337448591433112","url":"http://localhost:3000/@mastodonpy_test/109337448591433112","replies_count":0,"reblogs_count":0,"favourites_count":0,"edited_at":null,"favourited":false,"reblogged":false,"muted":false,"bookmarked":false,"pinned":false,"text":"Toot!","filtered":[],"reblog":null,"application":{"name":"Mastodon.py
+        test suite","website":null},"account":{"id":"109337440686176140","username":"mastodonpy_test","acct":"mastodonpy_test","display_name":"John
         Lennon","locked":true,"bot":false,"discoverable":null,"group":false,"created_at":"2022-11-13T00:00:00.000Z","note":"\u003cp\u003eI
-        walk funny\u003c/p\u003e","url":"http://localhost:3000/@mastodonpy_test","avatar":"http://localhost:3000/system/accounts/avatars/109/336/899/193/569/236/original/e639fe005819e5b9.jpg","avatar_static":"http://localhost:3000/system/accounts/avatars/109/336/899/193/569/236/original/e639fe005819e5b9.jpg","header":"http://localhost:3000/system/accounts/headers/109/336/899/193/569/236/original/26075346d9e9e361.jpg","header_static":"http://localhost:3000/system/accounts/headers/109/336/899/193/569/236/original/26075346d9e9e361.jpg","followers_count":0,"following_count":0,"statuses_count":8,"last_status_at":"2022-11-13","noindex":false,"emojis":[],"fields":[{"name":"bread","value":"toasty.","verified_at":null},{"name":"lasagna","value":"no!!!","verified_at":null}]},"media_attachments":[],"mentions":[],"tags":[],"emojis":[],"card":null,"poll":null}'
+        walk funny\u003c/p\u003e","url":"http://localhost:3000/@mastodonpy_test","avatar":"http://localhost:3000/system/accounts/avatars/109/337/440/686/176/140/original/d6cd9a5a5e65da30.jpg","avatar_static":"http://localhost:3000/system/accounts/avatars/109/337/440/686/176/140/original/d6cd9a5a5e65da30.jpg","header":"http://localhost:3000/system/accounts/headers/109/337/440/686/176/140/original/2b7760a42692fbde.jpg","header_static":"http://localhost:3000/system/accounts/headers/109/337/440/686/176/140/original/2b7760a42692fbde.jpg","followers_count":0,"following_count":0,"statuses_count":9,"last_status_at":"2022-11-13","noindex":false,"emojis":[],"fields":[{"name":"bread","value":"toasty.","verified_at":null},{"name":"lasagna","value":"no!!!","verified_at":null}]},"media_attachments":[],"mentions":[],"tags":[],"emojis":[],"card":null,"poll":null}'
     headers:
       Cache-Control:
       - no-store
       Content-Security-Policy:
       - 'base-uri ''none''; default-src ''none''; frame-ancestors ''none''; font-src
         ''self'' http://localhost:3000; img-src ''self'' https: data: blob: http://localhost:3000;
-        style-src ''self'' http://localhost:3000 ''nonce-lJqjH5SbTkpael4SdZALbA=='';
+        style-src ''self'' http://localhost:3000 ''nonce-AdovYHTElImlsTraM4+T8Q=='';
         media-src ''self'' https: data: http://localhost:3000; frame-src ''self''
         https:; manifest-src ''self'' http://localhost:3000; connect-src ''self''
         data: blob: http://localhost:3000 http://localhost:3000 ws://localhost:4000
@@ -111,7 +111,7 @@ interactions:
       Content-Type:
       - application/json; charset=utf-8
       ETag:
-      - W/"4b54f7967ec857e92cce1d49e76a2f0f"
+      - W/"347ae05af335832adf1d92ec306b7f67"
       Referrer-Policy:
       - strict-origin-when-cross-origin
       Transfer-Encoding:
@@ -127,9 +127,9 @@ interactions:
       X-Permitted-Cross-Domain-Policies:
       - none
       X-Request-Id:
-      - e1a47835-b453-42b0-b5da-b5ea88879ba7
+      - 76237660-e938-44be-91eb-0e254cb7a2e4
       X-Runtime:
-      - '0.024838'
+      - '0.025693'
       X-XSS-Protection:
       - 1; mode=block
     status: